Fix gcc warning on potentially uninitialized gdk_event.
authorAndreas Pokorny <andreas.pokorny@canonical.com>
Tue, 28 Jun 2016 14:35:36 +0000 (16:35 +0200)
committerWilliam Hua <william.hua@canonical.com>
Wed, 10 Aug 2016 17:36:38 +0000 (13:36 -0400)
gdk/mir/gdkmireventsource.c

index b829c8f0acfd754871459654b6ca0ec326b1c869..ce6af0ac44a45a82e4cf003e22e757d1a8bcd8cf 100644 (file)
@@ -325,18 +325,13 @@ handle_touch_event (GdkWindow           *window,
 
   for (i = 0; i < n; i++)
     {
-      switch (mir_touch_event_action (mir_touch_event, i))
-        {
-        case mir_touch_action_up:
-          gdk_event = gdk_event_new (GDK_TOUCH_END);
-          break;
-        case mir_touch_action_down:
-          gdk_event = gdk_event_new (GDK_TOUCH_BEGIN);
-          break;
-        case mir_touch_action_change:
-          gdk_event = gdk_event_new (GDK_TOUCH_UPDATE);
-          break;
-        }
+      MirTouchAction action = mir_touch_event_action (mir_touch_event, i);
+      if (action == mir_touch_action_up)
+        gdk_event = gdk_event_new (GDK_TOUCH_END);
+      else if (action == mir_touch_action_down)
+        gdk_event = gdk_event_new (GDK_TOUCH_BEGIN);
+      else
+        gdk_event = gdk_event_new (GDK_TOUCH_UPDATE);
 
       gdk_event->touch.window = window;
       gdk_event->touch.sequence = GINT_TO_POINTER (mir_touch_event_id (mir_touch_event, i));